From 48ff6b71e1f93a06d9184e52fbb92b8ae8401e6e Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Sat, 5 Feb 2005 12:39:34 +0000 Subject: [PATCH] bitkeeper revision 1.1159.245.1 (4204be86F8AKmyv5_m4N44YWgyyt_Q) Another NMI watchdog fix. Deferred NMIs need to ACK the local APIC. Signed-off-by: keir.fraser@cl.cam.ac.uk --- xen/arch/x86/traps.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index d053705c13..8e965c5f60 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -591,14 +591,14 @@ asmlinkage void io_check_error(struct xen_regs *regs) fatal_trap(TRAP_nmi, regs); } -static void unknown_nmi_error(unsigned char reason, struct xen_regs * regs) +static void unknown_nmi_error(unsigned char reason) { printk("Uhhuh. NMI received for unknown reason %02x.\n", reason); printk("Dazed and confused, but trying to continue\n"); printk("Do you have a strange power saving mode enabled?\n"); } -asmlinkage void do_nmi(struct xen_regs * regs, unsigned long reason) +asmlinkage void do_nmi(struct xen_regs *regs, unsigned long reason) { ++nmi_count(smp_processor_id()); @@ -607,7 +607,7 @@ asmlinkage void do_nmi(struct xen_regs * regs, unsigned long reason) nmi_watchdog_tick(regs); else #endif - unknown_nmi_error((unsigned char)(reason&0xff), regs); + unknown_nmi_error((unsigned char)(reason&0xff)); } unsigned long nmi_softirq_reason; @@ -695,6 +695,13 @@ asmlinkage int do_spurious_interrupt_bug(struct xen_regs *regs) return EXCRET_not_a_fault; } +BUILD_SMP_INTERRUPT(deferred_nmi, TRAP_deferred_nmi) +asmlinkage void smp_deferred_nmi(struct xen_regs regs) +{ + ack_APIC_irq(); + do_nmi(®s, 0); +} + #define _set_gate(gate_addr,type,dpl,addr) \ do { \ int __d0, __d1; \ @@ -803,7 +810,7 @@ void __init trap_init(void) set_intr_gate(TRAP_alignment_check,&alignment_check); set_intr_gate(TRAP_machine_check,&machine_check); set_intr_gate(TRAP_simd_error,&simd_coprocessor_error); - set_intr_gate(TRAP_deferred_nmi,&nmi); + set_intr_gate(TRAP_deferred_nmi,&deferred_nmi); /* Only ring 1 can access Xen services. */ _set_gate(idt_table+HYPERCALL_VECTOR,14,1,&hypercall); -- 2.30.2